only AC_DEFINE(HAVE_XFT) if we actually determined that we have Xrender

2000-12-14  Havoc Pennington  <hp@pobox.com>

* configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined
that we have Xrender

diff --git a/ChangeLog b/ChangeLog
index 0f848f51419a75c0480202c3710bc5c0ed28bbec..642a4e8592714b778b8469d0263320e99c78e019 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-14  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined
+       that we have Xrender
+
 Thu Dec 14 20:22:31 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0f848f51419a75c0480202c3710bc5c0ed28bbec..642a4e8592714b778b8469d0263320e99c78e019 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2000-12-14  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined
+       that we have Xrender
+
 Thu Dec 14 20:22:31 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0f848f51419a75c0480202c3710bc5c0ed28bbec..642a4e8592714b778b8469d0263320e99c78e019 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2000-12-14  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined
+       that we have Xrender
+
 Thu Dec 14 20:22:31 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0f848f51419a75c0480202c3710bc5c0ed28bbec..642a4e8592714b778b8469d0263320e99c78e019 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2000-12-14  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined
+       that we have Xrender
+
 Thu Dec 14 20:22:31 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0f848f51419a75c0480202c3710bc5c0ed28bbec..642a4e8592714b778b8469d0263320e99c78e019 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2000-12-14  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined
+       that we have Xrender
+
 Thu Dec 14 20:22:31 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0f848f51419a75c0480202c3710bc5c0ed28bbec..642a4e8592714b778b8469d0263320e99c78e019 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2000-12-14  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined
+       that we have Xrender
+
 Thu Dec 14 20:22:31 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0f848f51419a75c0480202c3710bc5c0ed28bbec..642a4e8592714b778b8469d0263320e99c78e019 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2000-12-14  Havoc Pennington  <hp@pobox.com>
+
+       * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined
+       that we have Xrender
+
 Thu Dec 14 20:22:31 2000  Owen Taylor  <otaylor@redhat.com>
 
         * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}:

diff --git a/configure.in b/configure.in
index 7e4bb057ab1a879fa3fcc2a39962d2f860d64737..5295327e540421d18c641709ade37fb08c447f2c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -409,9 +409,9 @@ if test "x$gdktarget" = "xx11"; then
 
   if $have_xft = 'true' ; then
     X_LIBS="-lXft -lXrender -lXext $X_LIBS"
+    AC_DEFINE(HAVE_XFT)
   fi
 
-  AC_DEFINE(HAVE_XFT)
   AM_CONDITIONAL(HAVE_XFT, $have_xft) 
 
   # Check for XIM support.